From 43f8526198c6ad98f7160a748d22d6f5e00e6f6c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 15 Dec 2004 14:30:53 +0000 Subject: [PATCH] Don't try to filter if impl->current_filter is NULL. (#161329, R. 2004-12-15 Matthias Clasen * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't try to filter if impl->current_filter is NULL. (#161329, R. McFarland) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkfilechooserdefault.c | 3 +++ 5 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 53215e43b0..46a6f4edc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-15 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't + try to filter if impl->current_filter is NULL. (#161329, + R. McFarland) + 2004-12-14 Federico Mena Quintero Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 53215e43b0..46a6f4edc4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-12-15 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't + try to filter if impl->current_filter is NULL. (#161329, + R. McFarland) + 2004-12-14 Federico Mena Quintero Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 53215e43b0..46a6f4edc4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-12-15 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't + try to filter if impl->current_filter is NULL. (#161329, + R. McFarland) + 2004-12-14 Federico Mena Quintero Merged from gtk-2-4: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 53215e43b0..46a6f4edc4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-12-15 Matthias Clasen + + * gtk/gtkfilechooserdefault.c (get_is_file_filtered): Don't + try to filter if impl->current_filter is NULL. (#161329, + R. McFarland) + 2004-12-14 Federico Mena Quintero Merged from gtk-2-4: diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 9bb6b38899..146f758381 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -4004,6 +4004,9 @@ get_is_file_filtered (GtkFileChooserDefault *impl, GtkFileFilterFlags needed; gboolean result; + if (!impl->current_filter) + return FALSE; + filter_info.contains = GTK_FILE_FILTER_DISPLAY_NAME | GTK_FILE_FILTER_MIME_TYPE; needed = gtk_file_filter_get_needed (impl->current_filter); -- 2.30.2